meson: Rename documentation option to gtk_doc

This name is what most of the stack is using.
Lets follow along, even though it is (imo)
uglier.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cf08e699a737fb11f2f2239f9815371ebc32ff38..20b4919b5391399448645a08c4275c9d663139f8 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,7 +105,7 @@ pages:
   image: registry.gitlab.gnome.org/gnome/gtk/master:v6
   stage: deploy 
   script:
-    - meson -Ddocumentation=true _build .
+    - meson -Dgtk_doc=true _build .
     - ninja -C _build
     - ninja -C _build gdk4-doc gsk4-doc gtk4-doc
 

diff --git a/docs/reference/gdk/meson.build b/docs/reference/gdk/meson.build
index 39ce4b3d42f7e66d4d8fc783f251e329e3f6cbb2..707481d90a0e8544ea3f68f161c89b0a180adfdd 100644 (file)
--- a/docs/reference/gdk/meson.build
+++ b/docs/reference/gdk/meson.build
@@ -99,7 +99,7 @@ if wayland_enabled
   src_dir += [ gdkwayland_inc ]
 endif
 
-if get_option('documentation')
+if get_option('gtk_doc')
   configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
 
   gnome.gtkdoc('gdk4',

diff --git a/docs/reference/gsk/meson.build b/docs/reference/gsk/meson.build
index 7e33a9bad3dd45196bf35e427b727953da53b720..6f95e8e2061d39a94f8d6577209daaf28d2816c9 100644 (file)
--- a/docs/reference/gsk/meson.build
+++ b/docs/reference/gsk/meson.build
@@ -34,7 +34,7 @@ private_headers = [
 images = [
 ]
 
-if get_option('documentation')
+if get_option('gtk_doc')
   configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
 
   gnome.gtkdoc('gsk4',

diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml
index ccdd787210dbc24b535fc4d7663ef955f626c75b..86d059fe90368877eaaf1eed5a60a1a4660d842a 100644 (file)
--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -355,8 +355,8 @@ How to compile GTK itself
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">-Ddocumentation=true</arg>
-            <arg choice="plain">-Ddocumentation=false</arg>
+            <arg choice="plain">-Dgtk_doc=true</arg>
+            <arg choice="plain">-Dgtk_doc=false</arg>
           </group>
           <sbr/>
           <group>
@@ -382,7 +382,7 @@ How to compile GTK itself
       </formalpara>
 
       <formalpara>
-        <title><systemitem>documentation</systemitem> and
+        <title><systemitem>gtk_doc</systemitem> and
           <systemitem>man-pages</systemitem></title>
 
         <para>
@@ -394,7 +394,7 @@ How to compile GTK itself
           <application>gtk-doc</application> installed and
           are modifying GTK, you may want to enable
           <application>gtk-doc</application> support by passing
-          in <systemitem>documentation</systemitem>.
+          in <systemitem>gtk_doc</systemitem>.
         </para>
         <para>
           Additionally, some tools provided by GTK have their own

diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
index 53d88ee9aa5310ae2682e91ae30682594b7eac08..1243d12c956497b2d94c4d447d8e1808e06a5920 100644 (file)
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -394,7 +394,7 @@ else
   types_conf.set('DISABLE_ON_QUARTZ', '')
 endif
 
-if get_option('documentation')
+if get_option('gtk_doc')
   configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
   configure_file(input: 'getting_started.xml.in', output: 'getting_started.xml', configuration: src_dir_conf)
 

diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 55b0fb9e470b9c74b2b97a58c6ddd237a5ad31f1..a308cc4c87e3d9e3ff8fd82102c7ff5bddee5d5a 100644 (file)
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -1,4 +1,4 @@
-if get_option('documentation')
+if get_option('gtk_doc')
   glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
   glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
 

diff --git a/docs/tools/meson.build b/docs/tools/meson.build
index 5de632f14176373f6207ecf0bcbc64303910622d..a7ec75b447c0c79c05fc868c237823bc5aa88f2d 100644 (file)
--- a/docs/tools/meson.build
+++ b/docs/tools/meson.build
@@ -1,4 +1,4 @@
-if x11_enabled and get_option('documentation')
+if x11_enabled and get_option('gtk_doc')
   doc_shooter_sources = [
     'shadow.c',
     'shooter.c',

diff --git a/meson.build b/meson.build
index 716298a7d934f0a26fa5e32680d512b2ea24d901..483a874475c02d86c77b7319b0aba64c276715d7 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -827,7 +827,7 @@ summary = [
   '    Colord support: @0@'.format(get_option('colord')),
   '          Profiler: @0@'.format(get_option('profiler')),
   '     Introspection: @0@'.format(get_option('introspection')),
-  '     Documentation: @0@'.format(get_option('documentation')),
+  '     Documentation: @0@'.format(get_option('gtk_doc')),
   '         Man pages: @0@'.format(get_option('man-pages')),
   '       Build tests: @0@'.format(get_option('build-tests')),
   '     Install tests: @0@'.format(get_option('install-tests')),

diff --git a/meson_options.txt b/meson_options.txt
index 20dc5d0338e4059047120462878314aeace2e8a1..73f26da7dadae5f8bd9f8df7ae84be10a2085c33 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -31,7 +31,7 @@ option('colord', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
   description : 'Build colord support for the CUPS printing backend')
 
 # Documentation and introspection
-option('documentation', type: 'boolean', value: 'false',
+option('gtk_doc', type: 'boolean', value: 'false',
   description : 'Build API reference and tools documentation')
 option('man-pages', type: 'boolean', value: 'false',
   description : 'Build man pages for installed tools')